fix: Add check table UUID to detect table replacement #2890
+115
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kevinjqliu
reviewed
Jan 12, 2026
Contributor
kevinjqliu
left a comment
kevinjqliu
left a comment
There was a problem hiding this comment.
Thanks for adding this!
Comment on lines
+1506
to
+1509
| # Only check UUID for existing tables, not new tables | ||
| if not isinstance(self, StagedTable): | ||
| self._check_uuid(response.metadata) | ||
|
|
Contributor
There was a problem hiding this comment.
What is the scenario where the commit response has a different table uuid?
The commit request should include AssertTableUUID so I would expect the catalog to verify that
| """Return the snapshot references in the table.""" | ||
| return self.metadata.refs | ||
|
|
||
| def _check_uuid(self, new_metadata: TableMetadata) -> None: |
Contributor
There was a problem hiding this comment.
nit: i find this easier to read as a staticmethod, wdyt?
@staticmethod
def _check_uuid(current_metadata: TableMetadata, new_metadata: TableMetadata)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rationale for this change
This PR adds table UUID validation on refresh and commit to detect when a table has been replaced. For example, if a table is dropped and recreated with the same name, this prevents accidentally operating on a different table than expected.
Modeled after the Java implementation.
https://github.com/apache/iceberg/blob/main/core/src/main/java/org/apache/iceberg/BaseMetastoreTableOperations.java#L202-L209
Python was missing this check.
Are these changes tested?
Added some tests at the table and catalog level
Are there any user-facing changes?
no